Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 20:11:55 +0000 (12:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 20:11:55 +0000 (12:11 -0800)

Trivial merge